Start 3.17 development

Bump the version to 3.17.0 and add version macros.

diff --git a/configure.ac b/configure.ac
index 09241cf99dc67657d4305988462873fff4deab14..f7c6438b69abb6020c0f35aea5595580699ac8b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,8 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [15])
-m4_define([gtk_micro_version], [12])
+m4_define([gtk_minor_version], [17])
+m4_define([gtk_micro_version], [0])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])

diff --git a/gdk/gdkversionmacros.h.in b/gdk/gdkversionmacros.h.in
index 7bf503ddc3b0469c5532c98f7b893ef6482b3b1c..e9d788de779443472ea844eead53f4106713b9b3 100644 (file)
--- a/gdk/gdkversionmacros.h.in
+++ b/gdk/gdkversionmacros.h.in
@@ -142,6 +142,16 @@
  */
 #define GDK_VERSION_3_16        (G_ENCODE_VERSION (3, 16))
 
+/**
+ * GDK_VERSION_3_18:
+ *
+ * A macro that evaluates to the 3.18 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 3.18
+ */
+#define GDK_VERSION_3_18        (G_ENCODE_VERSION (3, 18))
+
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
  */
@@ -340,5 +350,19 @@
 # define GDK_AVAILABLE_IN_3_16                _GDK_EXTERN
 #endif
 
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_18
+# define GDK_DEPRECATED_IN_3_18               GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_3_18_FOR(f)        GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_3_18               _GDK_EXTERN
+# define GDK_DEPRECATED_IN_3_18_FOR(f)        _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_18
+# define GDK_AVAILABLE_IN_3_18                GDK_UNAVAILABLE(3, 18)
+#else
+# define GDK_AVAILABLE_IN_3_18                _GDK_EXTERN
+#endif
+
 #endif  /* __GDK_VERSION_MACROS_H__ */